Merge branch 'dev' into feat_ut_backfill

rickchengx · web-flow · commit 8d9c2aba63ed · 2024-03-16T22:52:18.000+08:00
diff --git a/dolphinscheduler-ui/src/views/projects/preference/use-form.ts b/dolphinscheduler-ui/src/views/projects/preference/use-form.ts
@@ -125,7 +125,13 @@ export function useForm() {
         item.validate.required = false
         item.span = 12
       }
-      Object.assign(item, { props: { style: 'width: 250px' } })
+      if (item.type === 'select') {
+        Object.assign(item, {
+          props: { style: 'width: 250px', clearable: true }
+        })
+      } else {
+        Object.assign(item, { props: { style: 'width: 250px' } })
+      }
     }
     return preferencesItems
   }
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/detail-modal.tsx b/dolphinscheduler-ui/src/views/projects/task/components/node/detail-modal.tsx
@@ -130,7 +130,11 @@ const NodeDetailModal = defineComponent({
 
     const restructureNodeData = (data: INodeData) => {
       if (!data?.id) {
-        Object.assign(data, projectPreferences.value)
+        for (let item in projectPreferences.value) {
+          if (projectPreferences.value[item] !== null && item in data) {
+            Object.assign(data, { item: projectPreferences.value[item] })
+          }
+        }
       }
     }
 
diff --git a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx
@@ -240,6 +240,16 @@ export default defineComponent({
           form.environmentCode = projectPreferences.value.environmentCode
         }
       }
+      if (projectPreferences.value?.alertGroups && variables?.alertGroups) {
+        if (
+          containValueInOptions(
+            variables.alertGroups,
+            projectPreferences.value.alertGroups
+          )
+        ) {
+          form.warningGroupId = projectPreferences.value.alertGroups
+        }
+      }
     }
 
     const updateWorkerGroup = () => {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,13 @@ export function useForm() {`
`125`	`125`	`item.validate.required = false`
`126`	`126`	`item.span = 12`
`127`	`127`	`}`
`128`		`- Object.assign(item, { props: { style: 'width: 250px' } })`
	`128`	`+ if (item.type === 'select') {`
	`129`	`+ Object.assign(item, {`
	`130`	`+ props: { style: 'width: 250px', clearable: true }`
	`131`	`+ })`
	`132`	`+ } else {`
	`133`	`+ Object.assign(item, { props: { style: 'width: 250px' } })`
	`134`	`+ }`
`129`	`135`	`}`
`130`	`136`	`return preferencesItems`
`131`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,11 @@ const NodeDetailModal = defineComponent({`
`130`	`130`
`131`	`131`	`const restructureNodeData = (data: INodeData) => {`
`132`	`132`	`if (!data?.id) {`
`133`		`- Object.assign(data, projectPreferences.value)`
	`133`	`+ for (let item in projectPreferences.value) {`
	`134`	`+ if (projectPreferences.value[item] !== null && item in data) {`
	`135`	`+ Object.assign(data, { item: projectPreferences.value[item] })`
	`136`	`+ }`
	`137`	`+ }`
`134`	`138`	`}`
`135`	`139`	`}`
`136`	`140`
Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,16 @@ export default defineComponent({`
`240`	`240`	`form.environmentCode = projectPreferences.value.environmentCode`
`241`	`241`	`}`
`242`	`242`	`}`
	`243`	`+ if (projectPreferences.value?.alertGroups && variables?.alertGroups) {`
	`244`	`+ if (`
	`245`	`+ containValueInOptions(`
	`246`	`+ variables.alertGroups,`
	`247`	`+ projectPreferences.value.alertGroups`
	`248`	`+ )`
	`249`	`+ ) {`
	`250`	`+ form.warningGroupId = projectPreferences.value.alertGroups`
	`251`	`+ }`
	`252`	`+ }`
`243`	`253`	`}`
`244`	`254`
`245`	`255`	`const updateWorkerGroup = () => {`