This is an automated email from the ASF dual-hosted git repository.
SbloodyS 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 3cfee61064 [Fix-18307][API] The frontend is correctly using the
preferred values of the associated project for task creating and workflow
scheduling (#18308)
3cfee61064 is described below
commit 3cfee610644b007211eacaaca92b8dd16f27569c
Author: suyc <[email protected]>
AuthorDate: Tue Jun 23 15:46:18 2026 +0800
[Fix-18307][API] The frontend is correctly using the preferred values of
the associated project for task creating and workflow scheduling (#18308)
---
.../projects/task/components/node/detail-modal.tsx | 19 +++++++++++++++++--
.../workflow/definition/components/timing-modal.tsx | 6 +++---
2 files changed, 20 insertions(+), 5 deletions(-)
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
index d8cb54df94..e784947d52 100644
---
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,9 +130,24 @@ const NodeDetailModal = defineComponent({
const restructureNodeData = (data: INodeData) => {
if (!data?.id) {
+ const allowedFields = [
+ 'taskPriority',
+ 'workerGroup',
+ 'environmentCode',
+ 'failRetryTimes',
+ 'failRetryInterval',
+ 'cpuQuota',
+ 'memoryMax',
+ 'timeoutFlag',
+ 'timeoutNotifyStrategy',
+ 'timeout'
+ ]
for (const item in projectPreferences.value) {
- if (projectPreferences.value[item] !== null && item in data) {
- Object.assign(data, { item: projectPreferences.value[item] })
+ if (
+ projectPreferences.value[item] !== null &&
+ allowedFields.includes(item)
+ ) {
+ Object.assign(data, { [item]: projectPreferences.value[item] })
}
}
}
diff --git
a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx
b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx
index 08325a071b..c30230581a 100644
---
a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx
+++
b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx
@@ -259,14 +259,14 @@ export default defineComponent({
timingForm.environmentCode = projectPreferences.value.environmentCode
}
}
- if (projectPreferences.value?.alertGroup && variables?.alertGroups) {
+ if (projectPreferences.value?.alertGroups && variables?.alertGroups) {
if (
containValueInOptions(
variables.alertGroups,
- projectPreferences.value.alertGroup
+ projectPreferences.value.alertGroups
)
) {
- timingForm.warningGroupId = projectPreferences.value.alertGroup
+ timingForm.warningGroupId = projectPreferences.value.alertGroups
}
}
}